#1 fixed by reordering items after NotFound exception