Fixed Java Client