Fixed compilation to Java 1.6