class bug FIXED