Fixing argument normalization