Fixat buggar i Event o EManager