Fix WuJi and DuanChang