Hotfix for proper config