targetId does not seem to be updated correctly...