Correctly check ID
Cleanup
Merge pull request #177 from dreamteam69/master

Correctly check ID