Fixes issue #2
Fixes issue #1