Fix bug in ever growing path, reorder path items to make sense