Fix initialization of system