Fix env issue