Fix compatibility issue with Java 6
merge