Fixes issue #154