Fix for java6