Fix the bugs without a regretion also remove the event call, it's more fasted.