Fix for plot/table switching