Fix/2.6/plot upper bound