Solving the Where return issue