Changed and committed ... / #3889

Please check if it's okay.
There are some code lines (to transfer the ids) I'm not happy with. I commented them. So maybe you can have a more precise look at them.