Fix chart's subtypes