Fixed initialization of components