Fixes issue #214