add additional corner cases