Fix object constgruction bug

Change-Id: Ib5cecad69106e55e4df749d4300e59bdd5f0eef2