Fix Clone Bug