FIX : Metrics now working fine