Fixing the issue with parameter mapping