RobinHankin fixes #15