[-] CORE: Fix #PSCFI-7249 again