Fixed events domain issue