Only write id in case of a “trick”
Make sure all tests are passing
Merge pull request #117 from adobe-research/issue116

Issue116