Handle more cases.