Added logic in Metric to deal with skipped buckets