Reversed these two conditions so the more common one is first