Hotfix/0.7.6