Cb 32/prevent saving stale data