Fixing argument wrapping