Fix clone issue