First attempt to fix config