Quick class fix