Fixed all-servers issue