Submit fix
Merge branch 'hotfix/ticket_fix'