Fixed bug with shell