Fix doorkeeper event ordering