FIXED INCONSISTENCY FROM LAST MERGE.