Fixed JRE 6 compatibility once again