Fix/2.2/plot upper bound