Changed to compile with Java 1.6