Fix sort ordering