updated: aligned with upstream plugin.