#552 preserve environment