fixing issue where we were returning before the forks were complete