Fix final complete

Change-Id: I04326db3cbde0539b860e1f1bbf522ff0b7be26f