Fix for sorting
Merge pull request #1352 from reciprocity/feature/mockups-wf

Fix for sorting