0.3.16-hotfix