Fixes issue#53