Bugfix
- $id could be an integer and not a string.