Figures now stay in the right place