Fix bug with clientResourceId