Now Java 1.6 friendly!