Fix for TFS #246499