Feature 82: Fixing bug in cut and paste