Fixed Copy/Paste issue #142