Figure fix