fixed bug again?