fixed ENV stuff