Resolved boundary case issue