Bugfix #4