Fixed compatibility for Plugz