Fixes issue #225