Fixed JDK 1.6 incompatibility