Fixing metric duplicating for certain functions