Bugfix #74