Minor rework to further address multiple wrapping issue.