Trying to fix class problem