Fix for OVar and new bots