Fix event action tracking