Fixed broken class?