Fixed critical bug
Merge branch 'fix'