Fix to pass valid EnvironmentOptions