hotfix on hotbug
Merge branch 'hotfix/Hotbug'