Fixed events issue