add some corner cases