fixed bug in new feature
Finish hotfix