Merge pull request #184 from evansb/fix-id-bug
Fix id bug

(main@4cb4508608f5c02e620cfe8fbb6e3b098b5fba8c)