Fixed constant var bug
Merge