POULPE-448 Fixed, yet without tests