bugfix and java upload