Fixes issue 3076