Fixed needs_cursor?