Add exception to some corner cases.