Fixed issue with chart ordering