Small fix with wrapping