Fixed integration isuess for this plugin