before check pass , changed by jie