Fixes issue#73