Fix for issue 21533