Fix for Issue 11036