fixed bug211