Fix for BugId:98262