Events bug fixed