Fix very critical bug
Merge branch 'hotfix/CriticalBug'