Merge "Correction of the conditional statement"