fixed bug810