fixes issue #25