Fixed Fang's stuff again.