Fix parsing

Change-Id: I0a7edc078d565ae5b95020d169df7f2b348d32e7