fix problems after merging with lianglili