fixed bug1