Fix for multiple instances and caret offsets
Revert