Fixing not found issue