Fix to pct calculations