[ZD#28] Fix a bad bug
Merge pull request #18 from dbuchi/dbuchi/ZD28

[ZD#28] Fix a bad bug