fixed events handler