Fixed client hang on bootstrap (bug const_)