Fixing cursor for #9