2.5 bugfix