Fix previuos commit to compile with Java 6