And maybe this should be handled inside of `clone_system` client itself...