Fix for original plugin