update some bug from wan 2014-10-26