hotfix loading issue on production