Handing some corner cases