Sort fix #2
Merge pull request #1353 from reciprocity/feature/mockups-wf

Sort fix #2