condition directive fixes