Fixed event issues