corrected for plugin compatibility