Fix the common copy path