fixed overlapping variable and function name