Bugfix to dac1d3331ca461d871e8aee913fe21338bdce39e