Fixed ordering so it will flush first rather than rate limit when it shouldn't