Fixing issue with metric redistribution