Fix undefined variable warning
Merge branch 'feature-fix-issue-1'