Fixed bugs with bot