Fix Fork & Edit feature