Fixed metrics issue