Fixed inconsistency after merge