Fix for avbot

please merge this fixes.