artf712169: Bug fixing in 3.0