Fiddled with middleware ordering