Fix for config handling