Fixed event inception issue
Fixed AMD