BugFix for Server start issue