Fixed double invoking event