Fixes #7427 - Avoid use of params local variables