May be finally fix the file copy bug