hotfix/mean-bug-on-live