Handling for corner case