Fix for BugRace 10078