[-] CORE : Fix bug #PSCFV-11157 part 2