Bug 2079 fixed: added more operators to the metric evaluation