Previous checking broke a previously working case.  This change handles both.