#6012 avoid a surprise by keep notice of a change