Bugfix.
Bugfix.
Merge branch 'bug-hunt-pre-0.3' into develop