For #46.
Merge pull request #49 from gabceb/le717/issue-46

Fix regressions in plugin