Fixes issue #178