-- fixed the bug in plugin message handling