Fixed both dynamic-update cases for NH-3512