Refactor to avoid no previous request