Fix bug 1109289
Merge pull request #145 from lcamacho/bug-1109289

Fix bug 1109289