Java 1.6 branch fix