As you like, but I can't help thinking this will be a burden to maintain should the metric API change someday. I'll do the fix.