Fix not found issue