Check and correction for conditionals