fix the bug where different servers were not taken into account