Fix for Java 1.6 compliance