Fix for BugRace 10079