fixed inconsistencies