Fix for issue 11947