Fixed event arguments count on firing