HH-30380 fix for debug=pass