Fix regression defer to other machine