fixed variable
fixed merge leftovers