Added stop propagation fix