Fix initialization to be correct