CC fee computation fix