small modification before fork