Fixed cloning path problems