Better sort handling.