Fixes issue #33