Fix in ReferenceManager