Fix bugs in plotters
Fix merge conflict