customEvent fix