Fix edge cases with the charts and independent parties