Fixes the issues of having two envs