Fixed events callback issue