Hotfix for environments