Now Java 6 compliant