2.2.6 bugfix