WIP: Fixed a bug in initialization

Change-Id: I487a06e975e12b56b9e7a992fd34d910c07abcc5