Fix not-found issue