Fixing argument expansion