Fixes issue #231