fixes issue #237