Fix trailer parsing