Bugfix, reported by Alex Hoene