Adding stop propagation