Fix for issue 21535