Added support for corner case