Fixed issue #32 - Incorrect object was linked in the Editor