yeah, I added it to both, not sure whether I need this after I added it to fixEvent. I guess this should be removed.