Ensure compatibility for Java 1.6