Bugfix #174