Correction on q-value handling