Fixed figure overwriting