fixed corner case issue'