Fixes issue57.