Bugfix #13