Fixing Chart stuff