Bugfix #60