Resolves issue-0010

Error in logic, resulting in UX time not being displayed.
Merge branch 'hotfix/issue-0010'