Trying to fix eventing