fixed variable naming issue from last merge