Add switch NONBE_FIX_ISSUE_2518 to increase Q_new to mitigate the regression from issue #2518.