Fix for unmasking new environment configurations