Fixed reuse of vars