JDK 1.6 compatibility fix