Fixed issue with Environment ambiguity.