Handle remaining corner-cases
3 files changed