#60 Bugfix