Trying to fix Exposed Event