I was always hitting a corner case so it seems that this need some
drastic measures.

Change-Id: I3fdd278b9c3fed178513d653ef24ad8adf20cbd2