FIXED bug again x2