Fixed repetitive events issues