Implemented fix for the eager fetching problem.