Add fix for exception that could occur when using includes and top level members

Add fix for exception that could occur when using includes and top level members #5329