Update to work with Chart 0.17