hack for events until fix can be applied