Fix for custom property plugins