Fixes #140

Also removes one TODO
```
// TODO: Actually we should not modify the original objects and then copy them to the destination model, but the other way around...
```