fixed bug-a