Fixes: #2595 Using __construct to call plugin constructor
Fixes: #2595 Using __construct in plugin