Fix for order by when you only have 1:1 includes