Bugfix fixes issue #174