FIXED a bug YAYAY