Fixes issue 53