Fixes issue #230