Fixed issue on cloning with done corrections