Fix var
2.4->2.7
Merge branch 'alex'