Fixing bug with name passed to shell