Bugfix using proper 2.1 version of isMetric()