Added extra check into historyFix for sync