STORM-341: Added in the sorting suggested in JIRA