Fix initialization