Quick hotfix