Fixed bad heads

Change-Id: I1c116d4334d7a0ef2dfdbaa161d3329dee5ad324