Removed incorrect checks for top-guid.