Cursor bug fixed as much as possible.