Fixed #5459
Fixes shuttle being late AFTER it arrives