Fix for error introudced in previous #95820 related commit.
Merge pull request #25 from luisromangz/95820-FixNeighbourhoodSelectionProblems

Fix for error introudced in previous #95820 related commit.