cut and paste bug fix