Work around built-in shadowing not taken into account in 5f71be39a5b9bebe32b87c868416abe0fc548211
Merge pull request #4970 from s0undt3ch/develop

Work around built-in shadowing not taken into account in 5f71be3