Fixes issue#3