Fixed events. Tested and works of 0.7.4