copy changes fixes #129, #130