fixing inconsistencies