Fixed something with the figures