[nobug] env.dist improvement