Fixed for JDK 1.6