Bugfix in ad161eeb2f54cffb815ecf2b13076383a0811c6b