Fix supplier on fork