Fixed bugs.
Merge branch 'hotfix'