Bugfix in df8ecf38e72b1e74345388bcd0b4ab1eef5d5ac8