Clone before passing to java + new clone upstream