Fixed regression bug in support of JDK6