fixed cloneOrFetch function