Fixed shell bug