Fix shell environment issue