Fix regression on Stoney