Fix #9 (only normalise "id" if it's a string)