Recovery blocks & redundancy

Fixed a bug with the figure parsing