Fixed neighbor bug