Issue 2968 tikautil review

#2968 fix.