Fix issue with baba events