* Fixed event propagation
* Fixed missing dependency