Fixed: server can't initialize properly

I don't know why there are 2 previously merged commit here....probably due to a shaky rebase