CFY-648 fix small issue with base plugins