Fixed 'Only variables should be passed by reference' error
Merge branch 'hotfix/1.1.16'