Fork fix attempt