fixed bug again