Fix node ordering