Fix for operator "?" and for global functions