Covering more corner-cases.