Fix for variable assignment