fixes issue #27