Fixes issue 1055