bug fixed with event filtration