Changed incorrect variable
Merge branch 'master' into opt

Fixed wrong variable.