New attempt to fix the 2d plot bug on update