Fixing headpin migration