Changed stopping propagation