Fixed trail ordering (#16)