Cursor handling logic that causes a crash removed temporarily