Moved variable wrapping