Draft: Fixed copying of Draft points