Classpath fix