Fixed bug with (==)
Fixed bug with variables renaming