Fixed for JDK 6