Partial Fix.