fixed events dependencies