Fix startup for sure

Change-Id: I7274f5045d55e8330a86d3b831d47bc82515b207