experimental fix to remove sort requirement