Fix a duplicated servers bug
Add todo