[MF,RR]{refactoring} I22 - Bug fix