Code fix (added JRE 1.6)