Fixes issue #10 , it was introduced when I added multi server support.