I don't think so... but I'm going to stare at it tomorrow and think it through.   The previous version of the code didn't handle off-page situations, so at the least I've not made the problem worse.