Bugfix in 22f7b3341c7bc7f0bfd727bc9ef9c5ee2d31af15