Fixed sort order. Closes #21