Make this conditional much clearer