HHH-8154 bugfix proposal