Further fix for previous commit

See f5203498c6083f2b4a1b0b0d652d1fbb4092739f.