Added fix for java