Fix shell issue