Clone and set construction fix
Merge pull request #667 from tomasAlabes/master

Clone and set construction fix