A method of operating a multi-phase electric machine includes operating a six-phase machine with six phases that are configured into a first group having a first neutral connection and a second group having a second neutral connection. The method also includes determining whether at least one of the six phases is experiencing a fault. In response to the determining, the method includes combining the first and second neutral connections to form a common neutral connection to continue operating the six-phase machine by using the remaining phase not experiencing the fault.