Bugfix #27