Attempt to fix the double metric bug