Another 1.6 fix from @bufke