fix bad heads

Change-Id: Ia3df02bd0cc40eaf65567c7bffeba608c0db5990