[-] BO: Fix #PSCFV-7377 second part