fixed bugs with zhifang