Repaired a bug which led to their being two ServerControllers