Small adaptation in Driver.java