Fixing ENV format