Fix cloning/telebaton