Fix for [IZPACK-968]
Merge pull request #123 from rkrell/IZPACK-968

Fix for [IZPACK-968]