fixed some inconsistency