4.2 bugfix