Returning base.php to original 2.1.8
dprint() of addClause() using wrong variables