[DF-1970] fix events callbacks