FIX DR alignment with ordered by