Fix initialization bug