Bug Fix ShellGrammar