better clone support