Fix for latest changes in AfterPropertiesChangeEvent