Fixed server mode-change bug again