Temporary fix for ENV issues