Fix variable
Improved variable assignment