Fix stop for replication