fixing conflicts
Revert "Revert "Fixed error when Installing plugins""

This reverts commit 92126e8bbc6b47b02a7c6721f8b8e84f46149c8f.
Revert "Revert "Revert "Fixed error when Installing plugins"""

This reverts commit 1e5049ad813a937a8ec61f31f24c997af7ba0ec0.