I forgot to take into account revision [1028](interpolation correction for routing). Synchonize with [1108].