Added fix for bot errors