fixed bug*