[TODO-LIST #008] Yanmin:fixed a issue.