updated plugin source code with the fix from previous commit;