Fixes issue #1