@eLobato would you mind modifying cloning this way?