Super fix
Merge branch 'hotfix/crazy-bug'