Update to latest version; sortable fix