Fixed bug on line 126
Merge branch 'hotfix'