Fixes issue #35