Fixed the headpin nightly failures