TOD/VNAV cCalculation only correct for next, acitve waypoint

HI,
overall a great update. I noticed a problem with the VNAV/TOD calculation of the UNS. It only calculates the descent rate and TOD of the next, currently active waypoint in your flightplan. Within the menu you can chose another waypoint for the calculation (for example another, later waypoint on the STAR for your descent calculation), this waypoint is even displayed as the current calculated descent, but the calculation is actually for the next (here invisible) next active waypoint. The calculation just restarts when you have overflown this next waypoint in line messing up your initial descent. I'm sure a fix shouldn't be too hard. Kind regards
chris 
I have just encountered the same issue.
I flew to EINN via the TIPUR 2D arrival. I manually set the VNAV to waypoint to GILOG. However, the distance calculation was still to TIPUR and the altitude calculation was to 6000ft:
Passing TIPUR, the calculations were now correct to GILOG: