fixed: operator were never escaped