Bug fixed: handle event only necessary, increase version number