Fix one regression, more to go