@ avataring: a bug fixed