Java 1.6 client compile fix #2