Bugfix target id undef