fixed all the offset mismatches