fix extend #13 to multi-server support