Fixing neighbors hell