add guard to fetch