Adding fix for plotting