Another fix for Java8 SortedSet issue