Retested on Java