-Fixes issue #1