This is a reasonable fix for now but we should really look into the real fix for this so that we don't have to remember to always fire that custom event.