Better handle other cases