[Fix] Cursor issue #27