Fixes issue #30