fixed /where bug...ordering