Fix for BugRace 10078

Fix patch for 10078