Fix env master