Fix issue with reusing variable name