Apply one patch from Assar Westerlund <assar@sics.se>: