Fix plugin issue
Merge pull request #187 from jerv13/master

Fix plugin issue