Back porting to java-6
Minor fix