Fix trail_end in subscription