Ensure we do write back the cleared flag