Removing the artifacts of forking