Cursor handling bugfix