Another attempt to fix default environment loading