Minor adoption to force a new build