[ZD#5] Fix for this bad bug
Merge pull request #14 from dbuchi/dbuchi/ZD5

[ZD#5] Fix for this bad bug