Fixes issue #27