Copying fix for issue #1