2.2.6 Bug fixing.