Fixes issue #2