Fix for an event that isn't fired but should be.