Fix env creator