This might be futile. Maybe we should always wrap. Need to test.