Fix 'NotFound' bug