Fixes issue #207