Cleaning up a broken metric