Fixed all figures