fix hcal overlap