Formation Y->Z fix