Tolerate string and numeric ids. Fixes #21