[ZD#27] Fix a bad bug
Merge pull request #17 from dbuchi/dbuchi/ZD271

[ZD#27] Fix a bad bug