Fixed classpath (This should never have happened - but someone commited
untested changes to the master branch!)