Initial fix for #2389 . Able to show the plot chart