Further fix for caret behavior issue.