Fixed last fix for numeric types in where clauses