Bugfix #17