Q: Unitwaittime and GoTo

[Corbeau]

We are playing LongTurn and GreatTurn games with 23 hour turns. One of the must-have features is unitwaittime option set to 10 hours. However, the problem is that, once you set unit to GoTo somewhere, when the new turn comes and those units are supposed to follow the GoTo order, the limitation kicks in and the order is cancelled completely. So, is there any way to avoid this, meaning, for the unit to complete this order AFTER the unitwaittime period expires?