Fixed Copy/Paste bug