fixing regressions of 1.5.6 in remote case and with classpath: