Fix hidden tickets
Fix
Merge branch 'hotfix/hotfix'