Don't mix up variable names, to keep the original behaviour

Authored by ahmadsamir on May 19 2020, 3:28 PM.