added fallback to fix issue in cloning