Hotfix against v0.8.2