Fix env creating