#609 fixed bug with var assignment.
Merge branch 'feature/#609' into feature/#608