Add Jian's bugfix