Fixed some inconsistency