Fix case where id is 0
Merge pull request #1 from apersenius/master

Fix case where id is 0