Cursor converted to match 0.6