[Fix] Add missing code in 8.18