Fixes issue #4

....