Will eventually need a test case for this logic, maybe create a JIRA issue as a reminder?