Fix request ordering