Fixes issue60