Temporary fix for BugId:96472