Hotfix/improve stability