Fixes issue 9518