Fixing milestone sorting