Fixing env