Fix: data duplication was happening on propagation