Hardening/fixme9

### Description
- Fixed one FIXME P9.
- The other P9 is commented, let's discuss it ...