Fixed server start-up