Fixed fill in mapping to standardize limits