Shell bug fix