Fix initialization issue