Further .class fix