fixed bug210