fixed corner case fix