This commit fixes object copying