fix to work with JDK 1.7 ordering
reformat