Fix order of responses