Fix D9 build issue