Recompiled/changed for JRE 6