Fix for config scope