fixed variable assignment handling