Class still bugged