Fix angular events #2