Use original sorting logic