Fix charts #2271