Fixed the caret issue

Fixed the caret issue