Finally, fix page sort