A method of controlling a multi-phase electric machine includes implementing a first control method to control the operation of a six-phase machine that is configured as a combination of two three-phase machines. The method also includes determining whether a fault exists in the six-phase machine. In response to determining that the fault exists in the six-phase machine, the method includes implementing a second and different control method to control the operation of the six-phase machine.