fixes issue #22