Fix #8030 - fix multiple ref issue