Adding event bug fixed