Fix var assignment
Merge branch 'master' into compiled
Fix var assignment