Bugfix #11