Fixed classpath modifyied by Catalin's merge.