v2.0.5 - put back environment (not work without it!)