Fixing make_shape_plot bug