Avoid variable name conflict
Fix typo