Fix order so latest node can stop complaining