Fixed evevnt consuming problem, fixed multiple updates