Applied bugfix from Stefan. D'oh