Bug fix - add event handler to target that was missed before.