Fixed shell issue