Fix java_opt handling