Add sort for consistency