fixing cibot issues