Fixes issue #177