Fixes issue #206