ticket:3 hotfix