fixed for java