fix inconsistencies