fixed clone issues