Bug fix in condition to set CIRCUIT encoding