Fixes id collision, bug 1104