Fix cursor, removed logging