fix for emergency bug
Merge branch 'hotfix/emergency_fix_2'