Fix issue with environment