Prevent unnecessary deep copying
Merge pull request #530 from wilfriedvanasten/master

Prevent unnecessary deep copying