Fix clone mode