Quick hotfix made