small fix on plugins
Merge branch 'hotfixes' into develop