Figures display bug fix