Use variable inside methods to avoid error related to checking if a constant is empty
Merge branch 'hotfix/HAS#16'