Fixed broken figure referencing