Eliminate sorting hack