Fix bug

Change-Id: Ide4f8ac810f98bb192909f5f0408affc940e7446