Fixed issue with options for environments