fixes issue #54