clone issue fix