attempt at fixing race between replication and noting transitions