Fix #16010 change variable