Fixing bug #269 and a small performance improvement for metric display.