Bugfix #26