Event callback fixing;