[-] BO : Fix bug #PSCFV-12359 first part