Fixed event buble bug