fixed clone creation flow