[v0.0.6] Hotfix