Fix configuration scoping bug