fixed bug!!!