fixes issue #35