fix some inconsistency