Fork rebuild