Fixed found issue after testing