Added classpath fix