fixes issue #17